hm, again fixing some legacy problems