Fix 1099

rewrite previous pull request