Bug 1

Bug 1 
udoated