resolved issue #12