fixed #123, improved situation for #132