Fixed makedata