follow-up; minor bug-fix/clean-up of last commit

Change-Id: Ida920e32a5900d422fbb4e780eb689e6682e43e7