merged bugfix from theme js