Include changes suggested by @ageis