Resolve JavaDoc TODO. Thanks to ArneBab!