modified version to 1.2.5