Ref #17 - fixed