Resolve crashes from 1.3.0.5