WC-472 #comment
Bugfix