Add the removed part of #14