adapt changes from ika