#40 Thesis fix