Fix lambda not supported issue