Flux 17, fix of commit bug