Used a defadvice which makes it work as it's intended.