master check bug fix
resolved merge