Fixed commentPanel issue