[master] Hopefully simple fix