Bug Fix; lines 89, 293, 452