porting #203 fix