fix after JS cleanup