fixes #36 (30m)