Follow-up: 9a15ccdbfb2c48d6eb73999ad2a61701d7abd6f4
Merge pull request #359 from csnv/somefixes

Follow-up: 9a15ccdbfb2c48d6eb73999ad2a61701d7abd6f4