Fix for double values support