Docking AP fix for #315 by Blizzy78