maybe actually fix #300

THIS. IS. TIRESOME!