Fixes singleton again