Fixing Mock mode