Minor Bug Fix  Completed For Submission