Slight user experience improvement