Issue#282

resolves #282