Fixes #1 - onPersistOnly not being triggered