Fix #1

Code won't compile on the global test case anymore though, until #2 and #3 are done