Matching bugfix

updated to match bugfixed code