Closes #1202. (Ignore test, atm no way to make it pass)