Removed default parameters to build with 3.5