Fixed Issues 1