Bugfixes and added public issue