Fix issues with prompt