Bugfix hicup class scope (wip)