Added workaround for non-patch systems