Fix bug with extractSingle