Maybe fixes Issue #191