Issue 615

fixes #615