Take @oterral comments into account