fixed in e9a65bc and 1523fee