Resolved issue #162