Hack to fix MAA case