Resolving ticket 6070