Issue#645

resolves #645