Bug Fix for Bug #3.