Some fix Jacob.. ? ..