Fixed MCW-Bug