Fixed after further testing