fixes according #1910