fixed float crap after merge >.<