v1.5: Crash fix