Fix #11 (finally).