Bug fixed, compiles