this issue is in the original cwm code