Attempt to fix bug in GPU Simulator: bug #15