resolved and fixed