Fixing issue with wrong NULL-bitmap calculation - fixes #28