FORGE-2004: Fix for selection