master check bug fix