fixes commits from Amber