Removing a disfunctional hack