small code path fixing