Bugfix plus additional testing