Fixes bug #32