Fix #792

This PR *should* fix #792