Fixes #420 - forceSave() not always available