Fix Second Bug
Second Commit after merge and bug fix