Or not. Fixes #384