Mock fix