Fixed portion of #15