fixed final bug...