Tried out to add support for android >= 4.0.3