Better but still a fucking bug :-(