commit lock cahnges by Sebastian Freund