resolved issue #21