Fix building process, now should work properly