Bug fix

Minor bug fix (looks like a merge error) and version uprev