Next try at fixing issue