Much simpler fix