Fix singleton accessor