Quick bug fix - DON'T MERGE WITH MASTER

Master is broken. Will be fixed next time.