small fix, not all yet