me wbuild + better fix