Toomey, fixes #136