Fixed double commit bug