fixed the missing bits for commit 0d120033.