This version seems work fine