client mw crash
Merged