Fix for small merge issue