antonhornquist 2.0 fix