The workaround is good enough for me. Closes #181