Fixing issue #44, possibly.