Replaced 'empty' by 'none'