more fixes for issue #266