Fix mock-up bug