fix logic
fix regex
fix param