Fixed Bug caused by bug fix

Now working correctly