Partial fix imported from MR !35 (closed) but issue #84 (closed) suggests this fix isn't quite complete.