Fixed in 1b9bf57 and 7c6cc19