Attempt to remove hack with nil values

What we have discussed about