Fixes #266 Again.