Simplifying my fix