Fixed a bug where 'None' was falsely returned