Fixed the fixes.... Java is the greatest language ever!