[Fix] Make it work with latest starling