Removing the strange internal value handling