minor changes according to 7a2cc4ae096a90308c026dd857e19b4489b162cf