Nasty bug. Now it works a lot better