Use @tvjames's nicer fix