[artf676549] - Walk through bugs fixed