Make it a bit less ugly