Second half Fix for Bug #64 (Completed)