Fixes singleton