fix bug + debug

fix bug + debug