Fixed bug regarding NULL values overrides