Fixes #website/issues/166 and #website/issues/167