Fixed prompt behaviour