last fixes #3