Another refresh bugs fixed (i hope :) )