fixed problem with senario 1 #290
fixed senario issue #290