Fixed pretend false problem and removed boolean dependency.