Minor code change
Fix maven tests after reverting bad commit.