Fixed empty returns