Fix for decimal / double types