Fixing issue with last commit. Test added not yet ready.