Removed  null hardcoding