Maybe this will make everyone happy?