Edit Firm Bugfix