fixed #151 check for not null added