Ensure working now it doesn't install it every time, also Fixes #1