Ugly fix for now. 0 as default doesn't work here