Fix for Stian