updated for version 3.2.5