Fixed problem with empty single page values