Try to do it right this time