fixed
missed ones