Featurefix for #2