Attempt to fix double-conversion issue