Issue #298 Implemented