Bugfix + new keyword