addressing comments by @OlegHahm