*fixed* issue #31