Fixed for real now