add some safety