fixed API 17 inconsitencies