Applied patch from 06b.patch file