Fix for Bug #314