This is a workaround for Issue #60. It works but shouldn't be necessary