Fix for autocoordination and AP