Fix based on github comment