Hopefully fixed #86. This time for real. Maybe