1.2 version (wait for further fix)