Fix conflict with alignmaps