tidied up to fix travis breakage