Minor bugfix found in merge with S&B alpha branch