Fixing Critical(?) Bug