fixes for 0.23.5

issue #2