Fixing small issue due to last merge