Fix and general fix for #232