solves additional problem of issue #79