Merge fukuball's bug fix