Also fixed in [104e43c85ed11a98]