Fix #246

always not null?