Trying a fix for a weird edge case in #20