Update to version 4.0.7