Use new snore api and a bug fix