modif (reverted from commit a6cc08a40e90bc8e0dc02bfe8b104a9e7cdfff13)