Attempt to remove hack with nil values