Merge pull request #3453 from naglis/firedrive_fix