Fixed empty options issue