not really fixed, as it's a WONTFIX, but still relatively ok