BUG Fixed