fix for null parameter, all tests ok!