added master-relevant fix