re-fix for #1 after testing (10x @epcim)