Fix for Beacon Saving