Bugfix/singleton instance