Issue#264

resolves #264