Trying to fix Atlas Bug