resolves #603
fixes #602