Fix #619
... that is, fixing now :)