Wait, that should fix #11 even better.