*fixed* issue #41