Bugfix in constructor methods