Fix merge issue 1