Ok, this should really fix it this time.