added eXtremal's patch v3