Fix #32; fix for #28