Fixes compatibility mode issue