fix to work with 3.2