Takes care of issue #76