Relates to #62