Proper fix for R.java