- Implemented issue #279