Merging in small fix from lab branch