Workaround round 2.