fixes
merged
kA