fix with last comments