Some lifting for issue #66