modify to fit # 742 issue