Bugfix update for #548