Tried to fix r.java