Fix implementation of #62