minor fix (merge issue)
minor fix, merging issue