Fixes for [#232]