bugfix:  omitted modifications from mc16s change