fixes bug #436