#34 last fixes