Bug Fix

Line 1241