Fix for Bug 114.