more compact
fix