Working assemblies after patch 4.16