Adapted to new version 1.2.5.