ism: bugfix + improvement