Patch for aycanirican/hweblib#1