Fixed bug in the origins