Fixed suggestions in bf46b15 for #102