Added logic to fix #2591.
Added logic to fix #2591.

gwax/nikola,getnikola/nikola,gwax/nikola,andredias/nikola,knowsuchagency/nikola,getnikola/nikola,okin/nikola,knowsuchagency/nikola,andredias/nikola,xuhdev/nikola,xuhdev/nikola,xuhdev/nikola,getnikola/nikola,okin/nikola,getnikola/nikola,okin/nikola,gwax/nikola,xuhdev/nikola,knowsuchagency/nikola,andredias/nikola,okin/nikola