Fixed problem in selector and with fallback blocks.