[FIXED] singleton pattern was not used properly