Fix for empty case