Reworked fix for #359
Merge branch 'bugfix' of https://github.com/Jako/evolution into bugfix