#2256 is this PR, not the bug itself. Only list #2255 here and move that line at the end of the list please. :)