modified source to stop crashing on 2.0