#5 fix bug