fixed handling of None