Compatipility bug fixed