Fix #10

Fix the crash problem only.