Fix issue with binding of None