bugs fix additional question