Allow NULL params fix