Fixes #111
Temporary workaround for #138