Fixed non-JS version