Fix for issue #1. Now there should be no crash.