inferno bug and swap bug fixed