Fix #275 (pending changes in handwritten js)