Fix firstfile

This is the first bugfix with the new branch