Usability improvement, thanks to https://github.com/Steppe