Fix for allowing null values.