doing fix #2