Fixed work on issue #176