fixed compatibatility issues