Bugfix after test on linux and mac