[Bug fix for ACE]