Fix :DD (remove temp. feature)