Fixed possible version incompatibility