Fix merge issue with #616