Arty bug fixing