fixed #182 again, but remains a todo