issue #238 - implemented