Fixed & tested!