BUG FIX !! DONE