#23 fixes