Issue 615

fixed #615