Removed bug in Public