Fixes bug #38