adding fix for non-floated stuff