Temporary fix for the current crash