Fixed #3, it was a circular dependencey...