resolved issue #36