Added some protection