Fix for Repository Single function