Fix for issue 574