Fixed a first entry bug with 'Zero' and decimal entries