APD-7: make the non JavaScript version run.