Hopefully should fix some issues

Change-Id: I13274b9e809ba21b44d79df028a0815acbef21b0