Upcoming bugfix: issue 70