Fix for issue 266