Terminal + bug correction