Solved bug with extra data keys