bugfixes for fi