Implemented for #25