Bug Fix

Line 1248