Workaround a bug for now