#86, fixed findbug issues