One more attempt to build right