fix activity flow