solved compatibility issues