FIX: Use basename