Fixing it for real now