resolved issue #34