Version compatability bugfix