WP-2157 Fix the infinite loop, remove aliases