partial fix for __assign