better workaround for singleton error