fixed bug: return to base