Issue46 fix