Fixed after merged