Fix for Bug #13