Fix #603

Anything is explained in #603