Added some protection...