second try at fixes #3