This should have been commited for the fix for 1099