fixing issues with non-nullable properties