works in both

Change-Id: I8df55865b1aef9c27af051b658a8b7c3c80b8bb7