Fix for Long and Double