working well before this commit