Float issue fix