Donald Morgan - 2010-11-19

Source code modified to fix the problem