fixed some safety nets