fix from comments