fix for REV-650 (spam reduction)