fix clustering for non-scaled AS/EAP [merge]