Added some safety