Attempt to fix broken code