Now compatible with versions starting from 2.3.3