moidfy some bug