- Fixed issue #292 - take 2