last fixes for version 1.15...