Fixing float workaround