$ fix

Fixed nil handling