a change suggested by Marcelo