@christianv check why this was necessary