More correct way