Hot-fix to avoid FiberStack error