Fix #728 using a different method, not allowing any null data