#48 fix