You could also apply here the changes suggested in the above comment.