Crash fix and test call