#4 fixes