Make more compatible with appstrap