***
fixed code