Fixed first part of issue #75