Add one more check to listener - just to be on the safe side