Some upgrades to make sure it is working again :-) [ciroque]