Back to how it should be