fixed with Fabio's assistance