Partial implementing of fix