added fix for nul params