WC-453 #comment Huge bugfix, works much better, still problems with
removing