merged with fixes.patch