Implemented issue #300