Fix #1714 (finally)