Fixes bug #44