Added some checks to satisfy ShadowChilds curiosity :p