Waiting for fix :)

This has been open long enough, let's merge it before we forget about it again.