Added fix for Bjarni