ISSUE #11 resolved.