A simple solution to issue #20