fix for issue 325