resolved issue 32