[Issue#186][WIP] fixed code