Fix for nullable type conversion [npiaseck]