Fixed monkey patch order