Another attempt for fixing #255.
Fixes #255