Fixes crash from: #63