Fixed types - thanks mpetri