Fix: avoid errors due to BROKEN FEATURES !!!