fix bug due to common.java change