incorporated changes from commit b9de7e1ba11375