Added a hack for NULL values