fixed issue with keyifying null