de some bugs again