Float fix with horrible undoing