Option: None: Fix singleton