Fix merge issue (#10) - two lines missing