fixed to work with ICS and jelly bean