Removed returning an empty dummy object in preview mode again