Fixing ' bugs