Bug fix
Default values changed