Actually fix [#335]