Fixed some cases where a list isn't returned
reverted bad convert