Bug fix for #132