Workaround for 0.8?