hackily fixes #6