Fixed issue found in testing