Fixes too much singleton error