#660 small merge issue fixed