adjusted huge bug