#47 fix bug