Small bugfix with interactlistener + cleanup