Fixed singleton instance