Please review fix for issue 301