Better behaviour, works now