might have fixed untamed bug