resolved issue #18