Fix 0,0, again... ugly as hell...