Fixed problems with compatibility
Fixed problems with compatibility