Fix sgen again...