Fix #30 passing correct values and if empty use 0