Apply http://paste.lisp.org/display/142817#2