Still no fix available from upstream (unclear)