Make a bit less ugly