Fix crash in API 14 and 15. Close #22