Issue #327 - fixed