Fixed Issues 38,47,49