Sorry, solution change for bugfix1