Yes, I didn't find something better here. But moving forward, this code should be removed sooner or later.