fix last problem