Fixed Bug caused by last commit