Klas (Uppsala) is working on a patch with a flag SINGLE_OR_DOUBLE that solves this issue.