dec08_2013: Fixing Issue #2