FIX: Choose signals did not work correctly in some cases