WC-447 #comment Bugfix, functional