Fix #130

Fix properly #130
Add missing origin/