Fixed according to review comments