fixed compatibatility issues 2nd try