#513 still happens for me, even with these changes.