bugfix_master added