Fixed merge conflict in #41