#22 Fixed issue with missing code changes.