ticket:2
fixed after comment 22