First attempt to fix wedges