Manually apply PR #60, as no response from developer