Tilovell 918

Refixing #875 but with workaround for #918.