Fixed issue with double conversion