[rscardina]

As mentioned above, you may want to remove the tank off of the top and rod it out. Then you could add a baffle. I may still have to do this to mine if the thermostat doesn't help. I've got my fingers crossed.