Attempting to fix ToAmos issues