Fixed

Fixed null params