fix corner case; tweak params