this seems to be working too and is less ugly

Change-Id: I335572eee5e898b55423f6fbabd519e287933fa1