Fix: Make it work with with