Fixed the previous bug...