changed two files - fixed error
added master-relevant fix