Bug fix caused by kazu's bug fix --kazu