big bug fixed, reported by HIKA