[#62] Fixed crashing issues.