Fixed & tested on windows 7