Restoration message issue (Fixes #22)