Fixing Strange Bug