Fix Bounds Bug