addressed issue/316

...

...