Fix to issue 47.