Bug Fix

Line 1284