Fix 3355

http://yotpo-mantis.com/view.php?id=3355

need to be tested with this branch in widget: