Attempt at fixing Issue #57