#20 - Fix for Double, Long and Float types