implementation of feature #58