Removing order commit bug