Fixed A BUG