Last Little bit from bug fix