new build with mouse catch fix