This fixes bug #57