Might fix a problem, might not

Change-Id: If5ccae72ca5e4496babda8bf8447c8a711beefae