Fixed cascading issues.