Fixing data type select