Iss530

fix for issue 350