Resolved issue #2