duplicate bugfix from SSB develop branch