Fix for #141

Working!