merged bugfix