WC-476 #comment
Bugfix