changed back compatibility