Temporary workaround for TC problems, closes #58 and closes #60