Fixing a bug, allow Michael to continue to work