this should take care of issue #37