Changing to version 2.3.6