20141116 - Scope issue fixed