Added a check
This also works ^^
Too much to describe :P