fixes #35 (10m)