Merge "Small fix to make Eclipse happy"