bugfixes - reopened PR

to develop branch