fixed mention null