manually merge Alex's bug fix for bullet