I hate repeating myself :) but this should be handled by the bug mentioned above (first thing after this PR gets in)