Fixes bug #54