* minor modification as requested by @stof