MR !82 does not seem to fix exposed problem

MR !82 (merged) exposes a problem in its description but the diff does not seem to handle it at all