second attempt for pull request

second attempt for pull request
can you find a way to do it without modifying the interface?

request is valid anyway