FORGE-1417: Fixed wrong result returned