[#58] Fix to make merge nice