Workaround for #1. Fixes #1