Clumsily fixes #352