Minor bug fix to beta 22