FIX: felix now works
merge