Implementation for #75

#75