Bugfix for ret None and interval