Solve conflict with pull req #201