replaced hacking solution with a forgotten method.