Coming soon: Fixing the code