Fix to issue 57