applied patches by @hemmop