Issue390 - fixes #390