Fixed null value bug
master leading again