NULL values are now handled correctly.