Make page identical to php version. Fixes #249