Fix for issue #4 not working on kitkat