Fix issue, where some values didn't appear