Fixed merge conflict on 138ad0d