Corrected singleton