resolved issue #16