to do: fix it