WC-453 #comment Removing fixed