One more bug fix

v1.2