Last commit was missing a minor bugfix and a file