Merged a minor fix from @dantesguilherme