Fixed prev icommit

I had to copy and paste my code into the new code because there would
have been a conflict. It is foxed now.