Fix for AMO registration