* Reverted PR #199, causing #201. Fixes #201