fixed #84 for real (Diego)