Hopefully close #1717