Bug Fix

Fixing Bugs
Fixing bugs