Java part of source fix