fixes next to merge bugfix in develop