Bug Fix

Fixed bugs