Solve second part of issue #121