related to pr #2