#603

closes #603