fixed some bug for Jon