WC-479 #comment
Bugfix