fix bug s